]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st/theme-node: Support "auto" in lengths
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 31 Jan 2020 16:56:40 +0000 (17:56 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Fri, 31 Jan 2020 23:22:24 +0000 (00:22 +0100)
This allows resetting a fixed size to the default in a more specific
selector.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/971

src/st/st-theme-node.c

index bb630d9d3c70b2a018b95fcc02771622dc28cefa..31057b01294b5e2860a732aee9b24f500e340662 100644 (file)
@@ -1707,7 +1707,13 @@ do_size_property (StThemeNode   *node,
                   CRDeclaration *decl,
                   int           *node_value)
 {
-  get_length_from_term_int (node, decl->value, FALSE, node_value);
+  CRTerm *term = decl->value;
+
+  if (term->type == TERM_IDENT &&
+      strcmp (term->content.str->stryng->str, "auto") == 0)
+    *node_value = -1;
+  else
+    get_length_from_term_int (node, term, FALSE, node_value);
 }
 
 void